diff --git a/swh/account/resources/css/swh-account-theme.css b/swh/account/resources/css/swh-account-theme.css index a21928d..6c53670 100644 --- a/swh/account/resources/css/swh-account-theme.css +++ b/swh/account/resources/css/swh-account-theme.css @@ -1,49 +1,49 @@ .navbar-pf { background: white; border-top-style: none !important; border-left-style: none !important; border-right-style: none !important; border-bottom-style: solid !important; border-bottom-width: 2px !important; border-image: linear-gradient(to right, #e20026 0%, #fecd1b 100%) 1 1 1 1; } .navbar-pf .navbar-header { border: none; } .navbar-pf .navbar-title { padding: 0; height: 44px; line-height: 44px; background-position: center center; - background-image: url('../img/swh-logo.svg'); - background-size: 180px 44px; + background-image: url('../img/swh-logo.png'); + background-size: 180px 38px; background-repeat: no-repeat; width: 180px; margin-top: 0; margin-bottom: 0; } .navbar-pf .navbar-utility { top: -38px; } .navbar-pf .navbar-utility > li > a, .kc-dropdown > a { color: rgba(0, 0, 0, 0.75) !important; } .navbar-pf .navbar-utility > li > a:hover { background: rgba(0, 0, 0, 0.2); } .bs-sidebar ul li.active a { background: rgba(226, 0, 38, 0.33); border-color: #e20026; border-right: none; font-weight: bold; background-image: url(../img/icon-sidebar-active.png); background-repeat: no-repeat; background-position: right center; } \ No newline at end of file diff --git a/swh/admin/resources/css/swh-admin-theme.css b/swh/admin/resources/css/swh-admin-theme.css index 6049b63..5daf0a6 100644 --- a/swh/admin/resources/css/swh-admin-theme.css +++ b/swh/admin/resources/css/swh-admin-theme.css @@ -1,91 +1,91 @@ .navbar-header { background: white; border-top-style: none; border-left-style: none; border-right-style: none; border-bottom-style: solid; border-bottom-width: 5px !important; border-image: linear-gradient(to right, #e20026 0%, #fecd1b 100%) 1 1 1 1; } .navbar-pf .navbar-brand { padding: 0; height: 56px; line-height: 56px; background-position: center center; - background-image: url('../img/swh-logo.svg'); - background-size: 180px 54px; + background-image: url('../img/swh-logo.png'); + background-size: 180px 38px; background-repeat: no-repeat; width: 180px; } .navbar-pf .navbar-utility > li > a, .navbar-pf .navbar-utility > li.open > a { color: rgba(0, 0, 0, 0.75) !important; border: none; } .realm-selector { background: #efeff2; color: black; } .realm-dropmenu{ background: #efeff2; border: 1px solid #d5d5d6; } .sidebar-pf-left { background: white; color: black; } .sidebar-pf .nav-category h2 { color: black; } .sidebar-pf .nav-pills > li a i, .sidebar-pf .nav-pills > li a span{ color: black; } .sidebar-pf .nav-pills > li > a{ color: black; border-left-color: #efeff2; } .sidebar-pf .nav-pills > li > a:hover{ background: #efeff2; border-color:#efeff2; border-left-color: #393f44; color: black; } .sidebar-pf .nav-pills > li > a:after{ display: none!important; } .sidebar-pf .nav-pills > li.active > a { color: black; background: #efeff2 !important; border-bottom: 1px solid #d5d5d6 !important; border-top: 1px solid #d5d5d6 !important; border-left-color: #e20026 !important; } .sidebar-pf .nav-pills > li.active a i, .sidebar-pf .nav-pills > li.active > a .fa, .sidebar-pf .nav-pills > li.active a span { color: #e20026 !important; } .onoffswitch .onoffswitch-inner .onoffswitch-active { background-image: none; background: #e20026; } .nav-tabs-pf > li.active > a:before, .nav-tabs-pf > li.active > a:active:before, .nav-tabs-pf > li.active > a:focus:before, .nav-tabs-pf > li.active > a:hover:before { background: #e20026; } diff --git a/swh/common/resources/img/swh-logo.png b/swh/common/resources/img/swh-logo.png new file mode 100644 index 0000000..5cca97b Binary files /dev/null and b/swh/common/resources/img/swh-logo.png differ diff --git a/swh/common/resources/img/swh-logo.svg b/swh/common/resources/img/swh-logo.svg deleted file mode 100644 index f03bded..0000000 --- a/swh/common/resources/img/swh-logo.svg +++ /dev/null @@ -1,548 +0,0 @@ - - - - \ No newline at end of file diff --git a/swh/login/resources/css/swh-login-theme.css b/swh/login/resources/css/swh-login-theme.css index c4d0469..93215e9 100644 --- a/swh/login/resources/css/swh-login-theme.css +++ b/swh/login/resources/css/swh-login-theme.css @@ -1,98 +1,98 @@ a.social-provider { color: white !important; } .logo { - width: 70%; + width: 60%; margin-left: auto; margin-right: auto; display: block; margin-bottom: 1rem; } .btn-primary { color: #fff; background-color: #e20026; background-image: none; border-color: #e20026; } .btn-primary:hover { color: #fff; background-color: #bc0020; border-color: #af001d; } .btn-primary:focus, .btn-primary.focus { color: #fff; background-color: #bc0020; border-color: #af001d; -webkit-box-shadow: 0 0 0 0 rgba(230, 38, 71, 0.5); -moz-box-shadow: 0 0 0 0 rgba(230, 38, 71, 0.5); box-shadow: 0 0 0 0 rgba(230, 38, 71, 0.5); } .btn-primary.disabled, .btn-primary:disabled { color: #fff; background-color: #e20026; border-color: #e20026; } .btn-primary:not(:disabled):not(.disabled):active, .btn-primary:not(:disabled):not(.disabled).active, .show>.btn-primary.dropdown-toggle { color: #fff; background-color: #af001d; border-color: #a2001b; } .btn-primary:not(:disabled):not(.disabled):active:focus, .btn-primary:not(:disabled):not(.disabled).active:focus, .show>.btn-primary.dropdown-toggle:focus { -webkit-box-shadow: 0 0 0 0 rgba(230, 38, 71, 0.5); -moz-box-shadow: 0 0 0 0 rgba(230, 38, 71, 0.5); box-shadow: 0 0 0 0 rgba(230, 38, 71, 0.5); } .form-control:focus { color: #495057; background-color: #fff; border-color: #ff637d; outline: 0; -webkit-box-shadow: 0 0 0 0 rgba(226, 0, 38, 0.25); -moz-box-shadow: 0 0 0 0 rgba(226, 0, 38, 0.25); box-shadow: 0 0 0 0 rgba(226, 0, 38, 0.25); } .login-card-body .input-group .form-control:focus~.input-group-append .input-group-text, .register-card-body .input-group .form-control:focus~.input-group-append .input-group-text { border-color: #ff637d; } .custom-control-input:checked ~ .custom-control-label::before { color: #fff; border-color: #e20026; background-color: #e20026; } .custom-control-input:focus:not(:checked) ~ .custom-control-label::before { border-color: #ff637d; } .custom-control-input:not(:disabled):active ~ .custom-control-label::before { color: #fff; background-color: #ff96a7; border-color: #ff96a7; } .custom-control-input[disabled] ~ .custom-control-label, .custom-control-input:disabled ~ .custom-control-label { color: #6c757d; } .custom-control-input[disabled] ~ .custom-control-label::before, .custom-control-input:disabled ~ .custom-control-label::before { background-color: #e9ecef; } diff --git a/swh/login/template.ftl b/swh/login/template.ftl index 61a2114..c05532e 100644 --- a/swh/login/template.ftl +++ b/swh/login/template.ftl @@ -1,115 +1,115 @@ <#macro registrationLayout bodyClass="" displayInfo=false displayMessage=true>
<#if properties.meta?has_content> <#list properties.meta?split(' ') as meta> #list> #if>